Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 05:47:05 +0000 (22:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 05:47:05 +0000 (22:47 -0700)
commit6af9d25e6c4a87a1681fbfbf18a45a5729301359
tree1fc354b10faba488accd202851b903ebc1543e20
parent54883f73392a1121f4a247db9a1d2cc2c38f8b9d
parente1f4cd1cff2f698d9fd527a8ee77a7a1a951c8d6
Merge from trunk.
src/ChangeLog